Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Добавление лорных фракций v.2 (более корректная) #12

Merged
merged 61 commits into from
Nov 2, 2024

Conversation

Crazzy-pingvin
Copy link

Описание PR

Добавление спрайтов и прототипов для семи лорных фракция, а так же случайного ивента для одной, режима для второй и мобов для экспедиций для третьей.

Почему / Баланс

Как один из вариантов развития Некста, в качестве не-ванильного сервера, может выступать добавление конкретных лорных вещей для более удобного проведения ивентов, в качестве режимов или стучайных событий. Это позволит более полно окунуться в атмосферу созданной игровой вселенной, кроме того создать определённое разнообразие относительно привычных смен.

Технические детали

В текстурах, прототипах и локализации Корвакса добавились папки Lore со своими папками под каждую из добавленных фракций.

Медиа

Umpor
Nooc
Vitz
Petr
SNK
Mirt
KMLG

Требования

Критические изменения

Ничего критичного. Всё на основе имеющегося.

Список изменений

🆑

  • add: Добавлена одежда, снаряжение, вооружение, спавнеры и случайное событие для лорного государства Умпорская Федерация.
  • add: Добавлена одежда, снаряжение, вооружение, спавнеры для лорного государства Ноократия Эранта.
  • add: Добавлена одежда, снаряжение, вооружение, спавнеры для лорной корпорации Витезтви.
  • add: Добавлена одежда, снаряжение, вооружение, спавнеры и режим игры для лорной организации Петрищевцев.
  • add: Добавлена одежда, снаряжение, вооружение, спавнеры и вариант мобов в экспедициях для лорного государства СНК.
  • add: Добавлена одежда, снаряжение, вооружение, спавнеры для лорного государства Империя Миртана.
  • add: Добавлена одежда, снаряжение, вооружение, спавнеры для лорной корпорации Космологистика.

@Crazzy-pingvin Crazzy-pingvin requested a review from Morb0 as a code owner October 27, 2024 13:47
@lzk228
Copy link
Collaborator

lzk228 commented Oct 27, 2024

а зачем cl? если игроки не могут получить эти вещи, то cl на них не надо

@NotSoDana
Copy link

Половина спрайтов очень сомнительны, плюс возникает вопрос: А надо ли это вообще, если игроки это никак не получат в любом случае? Для педалей всегда прототипы есть

@CaptainSqrBeard
Copy link

Если бы это всё задействовалось геймплейно, а не ГМно, то смысл бы был. А так, скорее только будет мешать ГМить, когда эти энтити не будут задействованы

@Crazzy-pingvin
Copy link
Author

Crazzy-pingvin commented Oct 29, 2024

В ПР-е предусмотрены события и контент, что может быть задействован и без ГМов.
В любом случае такое добавление - это отличный фундамент для будущих обновлений. Всё нельзя разом делать. Сперва фундамент - потом стены.
Так же это интеграция лора в игру для тех, кому он нравится.
Ну и банальное удобство для тех ГМов, что захотят проводить ивенты по лору по актуальной версии. которая уже готова и в игре, а не искать и ждать в сети автора прототипов.

@github-actions github-actions bot added Changes: Sprites Changes: Map Изменяет карты Changes: Localization Изменяет локализацию No C# labels Oct 30, 2024
Copy link

github-actions bot commented Oct 30, 2024

RSI Diff Bot; head commit 030ff89 merging into c90af7f
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_armor.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_hardsuits.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_hardsuits_helmet.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET Added
off-inhand-left Added
off-inhand-right Added
on-equipped-HELMET Added
on-inhand-left Added
on-inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_nooc_hardsuits_field.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_nooc_hardsuits_helmet_field.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_backpack_rad.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_backpack_std.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_bandans.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_belt.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_beret.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_boots.rsi

State Old New Status
equipped-FEET-reptilian Added
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_boots_work.rsi

State Old New Status
equipped-FEET-reptilian Added
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_cap.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_cap_p.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_cepka.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_coat.rsi

State Old New Status
equipped-OUTERCLOTHING-vox Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_coat_hood.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_encryption_keys.rsi

State Old New Status
crypt_gray Added
label Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_epaulet_10.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_epaulet_20.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_epaulet_30.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_garniture.rsi

State Old New Status
equipped-EARS Added
icon Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_gloves_battle.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_id_cards.rsi

State Old New Status
cargotech Added
ce Added
cs Added
default-inhand-left Added
default-inhand-right Added
default Added
engineering Added
pilot Added
qm Added
repairman Added
security Added
servise Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_pda.rsi

State Old New Status
equipped-BELT Added
equipped-IDCARD Added
id_overlay Added
inhand-left Added
inhand-right Added
insert_overlay Added
light_overlay Added
pda Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_stamp.rsi

State Old New Status
stamp Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_cargotech.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_ce.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_engineering.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_pilot.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_qm.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_repairman.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_security.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
overlay-inhand-left Added
overlay-inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_servise.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/KMLG/kmlg_airlock.rsi

State Old New Status
assembly Added
bolted_open_unlit Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_open_unlit Added
emergency_unlit Added
open Added
open_unlit Added
opening Added
opening_unlit Added
panel_closed Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/Corvax/Lore/KMLG/kmlg_airlock_glass.rsi

State Old New Status
assembly Added
bolted_open_unlit Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_open_unlit Added
emergency_unlit Added
open Added
open_unlit Added
opening Added
opening_unlit Added
panel_closed Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_armor_gr.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_armor_std.rsi

State Old New Status
equipped-OUTERCLOTHING-digi Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_armor_vest.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_cloak_r.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_cloak_r_hood.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_hardsuits_hig.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_hardsuits_hig_helmet.rsi

State Old New Status
equipped-HELMET Added

Edit: diff updated after 030ff89

@Morb0 Morb0 merged commit 417f9dc into space-syndicate:master Nov 2, 2024
12 of 13 checks passed
@NotSoDana
Copy link

eto takoi konec

PuroSlavKing added a commit to PuroSlavKing/skibidi-station-69-next that referenced this pull request Nov 25, 2024
* [Port] Xenowears (space-syndicate#12)

* Xenowears (space-syndicate#519)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Add a bit of clothing specie related and some tiny misc changes.

Normally i wanted to add the spooders changes here but with the other
spider specie coming in il hold myself for now.

---

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Add clothings
- [x] Loadouts/Vending machines

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/47865d65-754d-4b70-9c10-19bc9aa55ac6)

</p>
</details>

---

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Xenowears! new non-human related clothings.

---------

Signed-off-by: FoxxoTrystan <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: VMSolidus <[email protected]>

* ooopsie

---------

Signed-off-by: FoxxoTrystan <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: VMSolidus <[email protected]>

* [Port] Plushie (space-syndicate#11)

* Plushie Update! (space-syndicate#654)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

By multiple requests i bring my PR from Frontier The [PLUSHIE
UPDATE!](new-frontiers-14/frontier-station-14#886)

This PR add a prize vendor machine where you can trade prize ticket for
a toy/plushie, to get ticket you win those in arcade machines.

This PR will give a chance for everyone to get the toys they need in a
special machine and will make plushies in general more random and fun,
in term of random spawns.

WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE
MAPPED.

---

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Prize Vendor
- [x] Prize Tickets
- [x] New Toys/Plushies
- [x] Prizes

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/643e6c65-bba0-4eef-8e8e-d3510922e51e)

</p>
</details>

---

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: A ton of new plushies has arrived
- add: Prize counter are here, get your prizes by winning games and
getting prize tickets! and find prize balls!!

* prize counter to spawner

* Arachne Plushie (space-syndicate#531)

Added everyone's favorite Arachne as an adorable soft toy

---

- [x] Place plushie in spawn location(s)

---

<details><summary><h1>Media</h1></summary>
<p>

![ArchnePlush](https://github.com/Simple-Station/Einstein-Engines/assets/114866135/1ec47181-4827-49f9-8605-9a16764dba89)

</p>
</details>

---

:cl:
- add: Plushie

* ooopsie

---------

Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: CodedCrow <[email protected]>

* [Fix] EE Migration (space-syndicate#14)

* [Tweak] Add Einstein Engines Folders (space-syndicate#17)

* [Tweak] EE Prototypes Folder

* [Tweak] EE RU FTL

* fix dublicate

* yaml fixes

---------

Signed-off-by: FoxxoTrystan <[email protected]>
Co-authored-by: FoxxoTrystan <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: CodedCrow <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменяет локализацию Changes: Map Изменяет карты Changes: Sprites No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants